summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-01-22 19:14:28 +0100
committerGitHub <noreply@github.com>2023-01-22 19:14:28 +0100
commit9184b6ed2bbc2547c431fd9453c0de8de5dec3c3 (patch)
tree321e5a953e07d161f9ea73c5d0c78c2d244fd9b9
parentMerge pull request #9637 from SaiKai/repeat_shortcuts (diff)
parentnsight_aftermath_tracker: update for latest Aftermath SDK (diff)
downloadyuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar.gz
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar.bz2
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar.lz
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar.xz
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.tar.zst
yuzu-9184b6ed2bbc2547c431fd9453c0de8de5dec3c3.zip
-rw-r--r--src/video_core/vulkan_common/nsight_aftermath_tracker.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp
index 85f1d13e0..5fa0d9620 100644
--- a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp
+++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp
@@ -57,7 +57,7 @@ NsightAftermathTracker::NsightAftermathTracker() {
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_EnableGpuCrashDumps(
GFSDK_Aftermath_Version_API, GFSDK_Aftermath_GpuCrashDumpWatchedApiFlags_Vulkan,
GFSDK_Aftermath_GpuCrashDumpFeatureFlags_Default, GpuCrashDumpCallback,
- ShaderDebugInfoCallback, CrashDumpDescriptionCallback, this))) {
+ ShaderDebugInfoCallback, CrashDumpDescriptionCallback, nullptr, this))) {
LOG_ERROR(Render_Vulkan, "GFSDK_Aftermath_EnableGpuCrashDumps failed");
return;
}
@@ -83,7 +83,7 @@ void NsightAftermathTracker::SaveShader(std::span<const u32> spirv) const {
std::scoped_lock lock{mutex};
- GFSDK_Aftermath_ShaderHash hash;
+ GFSDK_Aftermath_ShaderBinaryHash hash;
if (!GFSDK_Aftermath_SUCCEED(
GFSDK_Aftermath_GetShaderHashSpirv(GFSDK_Aftermath_Version_API, &shader, &hash))) {
LOG_ERROR(Render_Vulkan, "Failed to hash SPIR-V module");
@@ -121,8 +121,8 @@ void NsightAftermathTracker::OnGpuCrashDumpCallback(const void* gpu_crash_dump,
u32 json_size = 0;
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_GpuCrashDump_GenerateJSON(
decoder, GFSDK_Aftermath_GpuCrashDumpDecoderFlags_ALL_INFO,
- GFSDK_Aftermath_GpuCrashDumpFormatterFlags_NONE, nullptr, nullptr, nullptr, nullptr,
- this, &json_size))) {
+ GFSDK_Aftermath_GpuCrashDumpFormatterFlags_NONE, nullptr, nullptr, nullptr, this,
+ &json_size))) {
LOG_ERROR(Render_Vulkan, "Failed to generate JSON");
return;
}